From 95daffeca9126a1fc0bb71f910854103a7b2c195 Mon Sep 17 00:00:00 2001 From: tsteven4 <13596209+tsteven4@users.noreply.github.com> Date: Sun, 30 Jun 2019 07:15:17 -0600 Subject: [PATCH] spelling fixes for GUI (#372) * clion spelling fixes for GUI. Care must be taken to not lose translations! * fix clang tidy performance-unnecessary-value-param --- gui/advui.ui | 2 +- gui/format.h | 6 +- gui/gpsbabelfe_de.qm | Bin 59399 -> 59401 bytes gui/gpsbabelfe_de.ts | 177 ++++++++++++++++++++++--------------------- gui/gpsbabelfe_es.qm | Bin 66537 -> 66539 bytes gui/gpsbabelfe_es.ts | 177 ++++++++++++++++++++++--------------------- gui/gpsbabelfe_fr.ts | 177 ++++++++++++++++++++++--------------------- gui/gpsbabelfe_hu.ts | 177 ++++++++++++++++++++++--------------------- gui/gpsbabelfe_it.qm | Bin 69547 -> 69549 bytes gui/gpsbabelfe_it.ts | 177 ++++++++++++++++++++++--------------------- gui/gpsbabelfe_ru.qm | Bin 65902 -> 65904 bytes gui/gpsbabelfe_ru.ts | 177 ++++++++++++++++++++++--------------------- gui/latlng.cc | 6 +- gui/map.cc | 2 +- gui/processwait.cc | 2 +- gui/rttrkui.ui | 2 +- gui/serial_mac.cc | 2 +- gui/serial_win.cc | 4 +- gui/trackui.ui | 2 +- gui/upgrade.cc | 4 +- gui/upgrade.h | 2 +- 21 files changed, 563 insertions(+), 533 deletions(-) diff --git a/gui/advui.ui b/gui/advui.ui index 11596c4f7..d1e031fc2 100644 --- a/gui/advui.ui +++ b/gui/advui.ui @@ -50,7 +50,7 @@ Debugging diagnostics. -Higher number provides more deitaled diagnostics. +Higher number provides more detailed diagnostics. diff --git a/gui/format.h b/gui/format.h index 9954d492d..0a2786495 100644 --- a/gui/format.h +++ b/gui/format.h @@ -58,7 +58,7 @@ public: defaultValue_(defaultValue), minValue_(minValue), maxValue_(maxValue), html_(html) { value_ = QVariant(); - // Boolean values pay more atention to 'selected' than value. Make + // Boolean values pay more attention to 'selected' than value. Make // them match here. For non-bools, just make them unchecked. if (type_ == OPTbool && defaultValue.toBool() == true) { isSelected_ = true; @@ -166,7 +166,7 @@ public: bool fileFormat, bool deviceFormat, const QStringList& extensions, QList& inputOptions, - QList& outputptions, + QList& outputOptions, const QString& html): name_(name), description_(description), readWaypoints_(readWaypoints), readTracks_(readTracks), readRoutes_(readRoutes), @@ -175,7 +175,7 @@ public: hidden_(false), extensions_(extensions), inputOptions_(inputOptions), - outputOptions_(outputptions), + outputOptions_(outputOptions), html_(QString()), readUseCount_(0), writeUseCount_(0) diff --git a/gui/gpsbabelfe_de.qm b/gui/gpsbabelfe_de.qm index a877e18912c3d9be13ae5835794a617bcf3073cb..2e6800a3443ae1beb29f1a31dffe016725d41905 100644 GIT binary patch delta 1189 zcmXAodr*{R6vm(L^6tkX>_$)`T4F@oY#Kt3lX07V5rM;ye`KLGCz$gLj% z`aO^@3;`DoS6|Y3+=YClf`TE)zg7YEf$E3)l1i}GsY=zSU>jlq`9H8NM<^ZuJ0Js* zsbHNMKz#*N?GhfQ zlH16V`ZT1>2>_aVk<88FxE(UC6aBNfq z#-kW2PopkRc$jE3^b4ha#{knZp%?K$(=E}f#|`jo6ayYT103??yG5Na&1=Pw&?NEa zC*)egZt=0nK`w5R*lEhSJS9CFMFzFGNPhQ50UxInp#KCI@8fsH5FwrWN;>b)rPCdZ zw0lTr?6owDRr-Bk1h{7Bagxq(UH;Hy1D3YR#m`g4MK|Pq_D~?HTW&o^+2tSbeUe^y zz+0r?l5v5Vyn29LCsv?)4NSG3p|17g)Fa+>@#<>oyh{SD8tRxf%_YbxtB4T7(hBh`8A z@|{s~z{x9Qop6e`$RQp%s(*B}guyAQneauxH+lR|S#PLU5>z*V(6vfZxE1K~Q$BOd zr(!dTEp#vNbqo(+(dq-rgF{QH)t7u5(+gX91v3j>{1kot`D11@jHu_^HUSBW`laZD zK>8YWN;3TrKSiih_LH<5gFIGc6q@)pm0mFL3YFeqQU4Z8CdC%H29=fo-s(hP-T}sf`6ZQcL5l01A8GScJ6t#Z&EKyB}wz@nAFinuvJS+py|mE2b` z3r3!(m^}vE-Y=h9i-3ErUSgyXzdF|5sV0w@@CFZ_2N@YWgk%0NqJyo{FOc+IjD(HWZ&>S6fvo_XedF6TMV**zfc8W8vA zzI_-Ftw2Er;Q_+W0Qn+N{{m2E01ewFa7afOOz~+Tn-fL?c{xDi3JArw0ry5obsq!z zLP)(`KyO9ac{k^WkS>=}&UwsZGJeC*?Lm97coB^e>hA*T`-Gva%N3ZLhI;RRsQq0u+|LKB#jvkY1IDk=RkD_* zjPVe`7~HNZ_WTAgEmWOA6!7&O!L?NbxKsWbFl((4IyM5t zKjKw_zfYVnYO<4#i6ZN!>pgJl4W$GAkLn>+s1QJ@Lx*p0d*}}_3 zz3K@+A@!z@W%hE+#BF#3IGVbh$??7A`>8Ot$$X328pgK4f;f zz%bj@IxcWEvz;TH);WO-_D*2L5?0kueS`z7#zb}TuB^_LE@??-O(x2B$zb-j9pD?K zIfhN_!h=ClV3>{Fegt^jmwlZ{{h%OuR(ULN@ihNI@^@Y*|K&#N%}$cX<_7>rH}X+Q zZ?GxR@*N;BQc0L^0h&FO9d<7oGpbkvcLGO3c?b(rf37?|7(^s0c@fjAvUn{stD5+A zdcF8dve9rs?PW~{q80V)VS9mhR;ZH_$AF*A>ZIL7`o_;ZMK-Dq^CDTV((_tbZ-`O< z9zn82iU|XhE zJ4h^->$JhcF691O+Nk?~009sk5Zzp76c zdh93=H&wU9Z#ErvNSBRlz_nIaHE%WW#<#lW5db-zx<1ofV5*?IV%td7qV8tT08q7E zH_~#GF0vyF7&6( Debugging diagnostics. -Higher number provides more deitaled diagnostics. +Higher number provides more detailed diagnostics. Fehlersuche: grössere Zahl bedeutet detailliertere Diagnosebeschreibungen. @@ -488,17 +488,17 @@ p, li { white-space: pre-wrap; } default - + Select one or more input files eine oder mehrere Originaldateien markieren - + Output File Name Zieldatei-Name - + Error reading format configuration. Check that the backend program "gpsbabel" is properly installed and is in the current PATH This program cannot continue. @@ -507,7 +507,7 @@ This program cannot continue. Das Programm muss abgebrochen werden. - + Some file/device formats were not found during initialization. Check that the backend program "gpsbabel" is properly installed and is in the current PATH This program cannot continue. @@ -516,7 +516,7 @@ This program cannot continue. Das Prgramm muss abgebrochen werden. - + Input and output formats do not support %1 Keine Unterstützung für %1 im Ein- oder Ausgabeformat @@ -529,109 +529,109 @@ Das Prgramm muss abgebrochen werden. Eingabeformat unterstützt %1. Keine Unterstützung für %2 im Ausgabeformat - + Input does not support %1; output format supports %1 Keine Unterstützung für %1 im Eingabeformat; Ausgabeformat unterstützt %1 {1;?} - + Input format supports %1; output format does not support %1 Eingabeformat unterstützt %1. Keine Unterstützung für %1 im Ausgabeformat {1;?} - + Both input and output formats support %1 Ein- und Ausgabeformat unterstützen %1 - + waypoints Wegpunkte - + tracks tracks - + routes Routen - + There are no input options for format "%1" Es gibt keine Eingabeoptionen für das Format "%1" - - + + Options for %1 Optionen für %1 - + There are no output options for format "%1" Es gibt keine Ausgabeoptionen für das Format "%1" - + No valid waypoints/routes/tracks translation specified keine gültige Angabe von Wegpunkt-/Routen-/Trackfiltern - + No input file specified keine Quelldatei angegeben - + No valid output specified keine gültiges Ziel angegeben - + No output file specified keine Zieldatei angegeben - + Process "%1" did not start Prozess "%1" wurde nicht gestartet - + Process exited unsuccessfully with code %1 Prozess endete mit code %1 - + Translation successful Konvertierung erfolgreich - + Error running gpsbabel: %1 Fehler beim Aufruf von gpsbabel: %1 - + Are you sure you want to reset all format options to default values? Sind Sie sicher, dass Sie alle Formatoptionen auf die Vorgaben stellen wollen? - + About %1 Über %1 - + One or more data filters are active Einer oder mehrere Datenfilter sind aktiviert - + No data filters are active Keine Datenfilter sind aktiv @@ -901,28 +901,28 @@ Das Prgramm muss abgebrochen werden. MiscFltWidget - - - - + + + + Tracks Tracks - - + + Waypoints Wegpunkte - - + + Routes Routen @@ -1149,13 +1149,13 @@ Manche Dateiformate unterstuetzen nur eine Teilmenge, entweder Wegpunkte oder Tr Prozess beenden - + Process did not terminate successfully Prozess endete mit Fehler - - Process crashed whle running + + Process crashed while running Prozess-Crash bei Ausfuehrung @@ -1255,7 +1255,7 @@ Die Qualität der Ergebnisse hängt von der Länge der Route ab und davon, wie d - The reversal is performed in the laziest way possible. Timestamps are kept with the original waypoints so the resulting track or route will have the interesting characteristic that time runs backwards. This tends to make Magellan Mapsend, in particular, do a wierd thing and place each waypoint on a separate day. + The reversal is performed in the laziest way possible. Timestamps are kept with the original waypoints so the resulting track or route will have the interesting characteristic that time runs backwards. This tends to make Magellan Mapsend, in particular, do a weird thing and place each waypoint on a separate day. Additionally, if you're using this to reverse a route that navigates, say, an exit ramp or a one way street, you will be in for unpleasant ride. application cares about timestamps punctuation checked twice Die Umkehrung wird auf die einfachst-mögliche Art durchgeführt. Zeitangaben bleiben mit dem Original-Wegpunkt verbunden. Dadurch ergibt sich das interessante Detail, dass die Zeit in der resultierenden Route bzw. dem Track rückwärts läuft. Das führt dazu, daß insbesondere Magellan Mapsend wilde Dinge anstellt, wie z.B. daß jeder Wegpunkt auf einen anderen Tag gesetzt wird. @@ -1322,38 +1322,43 @@ Diese Option korrigiert die Uhrzeit aller Trackpunkte. Dies kann nützlich sein, Verschieben - - + + weeks + + + + + days Tage - + hours shortform variant seemed sensible Std. - - + + mins shortform variant seemed sensible Min. - + secs shortform variant seemed sensible Sek. - - + + Use track pts. after this time. Nur Trackpunkte nach diesem Zeitpunkt behalten. - + Use only track points after this timestamp. This option is used along with the stop to discard trackpoints that were recorded outside of a specific period of time. This option specifies the beginning of the time period. @@ -1362,33 +1367,33 @@ This option is used along with the stop to discard trackpoints that were recorde Diese Option wird zusammen mit ihrem Gegenspieler verwendet, um Trackpunkte zu verwerfen, die sich ausserhalb eines bestimmten Zeitfensters befinden. Diese Option definiert den Anfang des Fensters. - + Start Start - + If checked, time specified here is based on this computer's current time zone. Wenn angekreuzt, richtet sich die angegebene Zeit nach der Zeitzone dieses Computers. - + If checked, the times specified here are based on the local computer's time zone. Otherwise it is UTC. Wenn angekreuzt, richtet sich die angegebene Zeit nach der Zeitzone dieses Computers. Wenn nicht, wird UTC angenommen. - + Local Time Lokale Zeit - - + + Use track pts before this time. Nur Trackpunkte vor diesem Zeitpunkt behalten. - + Use only track points before this timestamp. This option is used in conjunction with the start option to discard all trackpoints outside of a given period of time. This option defines the end of the time period. @@ -1397,18 +1402,18 @@ This option is used in conjunction with the start option to discard all trackpoi Diese Option wird zusammen mit ihrem Gegenstück verwendet, um alle Trackpunkte auβerhalb eines Zeitfensters zu verwerfen. Diese Option definiert das Ende des Fensters. - + Stop Stop - + Pack all tracks into one. no sentence Tracks zu einem Track verketten - + Pack all tracks into one. This option causes all tracks to be appended to one another to form a single track. This option does not work if any two tracks overlap in time; in that case, consider using the merge option. @@ -1421,18 +1426,18 @@ Diese Option sorgt dafür, daβ alle Tracks hintereinander zu einen gemeinsamen Diese Option eignet sich am besten dafuer, Tracks zu verbinden, die durch eine Fehlfunktion oder eine automatische 'über-Nacht-Auftrennung' aufgeteilt wurden. - + Pack guesswork, depends on context Verketten - + Merge multiple tracks for the same way. Tracks auf einem Weg mischen. - + Merge multiple tracks for the same way. This option puts all track points from all tracks into a single track and sorts them by time stamp. Points with identical time stamps will be dropped. @@ -1441,12 +1446,12 @@ This option puts all track points from all tracks into a single track and sorts Diese Option übernimmt alle Punkte aus allen Tracks in einen einzigen Track und sortiert sie nach der Zeit. Punkte mit den gleichen Zeitdaten werden entfernt. - + Merge Mischen - + Split by Date Split tracks. nach Datum teilen @@ -1470,43 +1475,43 @@ Mehrere Tracks, die sich ueber Tagesgrenzen verteilen, können so ebenfalls an D Aufspalten - + If nonzero, the track will be split if the time between two points is greater than this parameter. If zero, the track will be split by date. Falls nicht Null, und wenn die Zeitdaten aufeinanderfolgender Trackpunkte gröβer sind als der angegebene Wert, wird der Track dort aufgesplittet. Bei Null wird der Track an den Datumsgrenzen aufgeteilt. - + hrs abbr point Std. - + Split by Dist. nach Entf. teilen - + If nonzero, the input track will be split into several tracks if the distance between successive track points is greater than the distance given as a parameter. Falls nicht Null, und wenn die Distanz aufeinanderfolgender Trackpunkte gröβer ist als der angegebene Wert, wird der Track dort aufgesplittet. - + ft ft - + m m - + km km - + mi meilen @@ -1528,43 +1533,43 @@ Diese Option erzeugt GPS Fixwerte und setzt diese für alle Trackpunkte auf die Die Option wird eingesetzt, um ein Format, das keine Fixdaten enthält in eines zu konvertieren, das sie voraussetzt. - + GPS Fixes GPS Fixdaten - + none keine - + pps PPS - + dgps DGPS - + 3d 3d - + 2d 2d - + Synthesize course. no sentence Kurswerte generieren - + Synthesize course. This option computes (or recomputes) a value for the GPS heading at each trackpoint. This is most useful with trackpoints from formats that don't support heading information or for trackpoints synthesized by the interpolate filter. The heading at each trackpoint is simply the course from the previous trackpoint in the track. The first trackpoint in each track is arbitrarily assigned a heading of 0 degrees. @@ -1573,33 +1578,33 @@ This option computes (or recomputes) a value for the GPS heading at each trackpo Diese Option erzeugt oder errechnet einen Wert für den GPS-Kurs an jeden Trackpunkt. Das ist insbesondere dann nützlich, wenn ein Format konvertiert werden soll, das keine Kursdaten enthält - oder für Trackpunkte die vom Mittelwert-Filter generiert wurden. Der Kurs an einem Trackpunkt ist einfach die Richtung vom vorherigen Trackpunkt zum aktuellen. Dem ersten Trackpunkt in jedem Track wird automatisch ein Wert von null Grad zugewiesen. - + Course Kurs - + Synthesize speed. no sentence Tempodaten generieren - + Split by Time nach Zeit teilen - + Synthesize speed. -This option computes a value for the GPS speed at each trackpoint. This is most useful with trackpoints from formats that don't support speed information or for trackoints synthesized by the interpolate filter. The speed at each trackpoint is the average speed from the previous trackpoint (distance divided by time). The first trackpoint in each track is assigned a speed of "unknown." +This option computes a value for the GPS speed at each trackpoint. This is most useful with trackpoints from formats that don't support speed information or for trackpoints synthesized by the interpolate filter. The speed at each trackpoint is the average speed from the previous trackpoint (distance divided by time). The first trackpoint in each track is assigned a speed of "unknown." this time it _is_ a full sentence correct the original instead Tempodaten generieren Diese Option generiert für jeden Trackpunkt einen Geschwindigkeitswert. Sie wird eingesetzt, wenn ein Format konvertiert werden soll, das diese Daten nicht enthält - oder bei Trackpunkten, die vom Mittelwert-Filter generiert wurden. Das Tempo an jedem Trackpunkt ist die mittlere Geschwindigkeit vom vorherigen (Weg durch Zeit). Dem ersten Trackpunkt in allen Tracks wird der Wert 'unbekannt' zugewiesen. - + Speed Geschwindikgkeit diff --git a/gui/gpsbabelfe_es.qm b/gui/gpsbabelfe_es.qm index 7d74bc4e6f249662c7df59eba9621502fec7bf4c..d0813da2ff309d66813d0b9a5ec9e5275a82b170 100644 GIT binary patch delta 1163 zcmXAoe@xVM7{}jt-|zRn9o&H;c2T3_Ai5z0f^k40=uMzG`4u3)vSDz+rFqDYuz*+- z0k=rtgF!K};b4cj1HA}svo$%0lMXBe2hp<95GX{DWihFT_0RXcXW!@ZdEU?Kc|LQs z{6a0?P?GsIz*PgE?;vd^%>-mOfoo3#q9^bn*qzX7@h z@Llf$JM+Ph+JJjo8y%|6ncyeuDbRzTY5>O1H?FFyG!SBkfD79o?2iEg%@Fe2D9(WJ zArEBcLFmZ=F8M&#%>nkSkXfjbeG#&ank48XjJ4@OOkCNL!g9E#A z&X6`@w|6>F(uKHf(yR`)tpX=kBQZE&)r#`^-0YL@gP2^c&k^?kI7n(dJW#Y%waUTOGC$-q9NG-`bX zc;^wTmuiB(|Ci`p8I(TOS%KL}P8g;$f4suEMG`1G&v`$%0YqeQzUudZWmh&KjrMq! z8$KtH`%>;(%W3My%>DY+b>Oc(>;+Dxxy&EaRRgcC@#Rm_T?woF2}>}Ibdc||Q+9VR zGjM8&8#}>iHSvPZy$@(N36bZi@B5`fyq>gsR!HQQXmEAR!KvgGLTw*WT-w6^;SKl2&|M3@|c!&gwSkg z2^UnvA-+(y9=;tI+0U-j~3u*ZC~JVboh z`XaH@vlu}wu``1ZCYfgKLXgD59D-JpB=@O)4LIs8e?IynpsGWjowW|kOv$rPlDmKI zvaK?;WQ2v%m$5XNTGJw*i6H_8y;DF<6)@K56kIe0WF#t?aZ+tGVmc!&BCB zuhZ}ONkIRqvwxW$I8f~zkV_jdzs7!&1xcP^N-@lDQgNhq6}VohC^yo-0lDJiVGTW_ zor;z`+Mz zO54aroS~BGdf-i$Tg#+NdzkQq+CS3O z1bWiJQLgQwsX$z(>vy^xKv{UJ?HR$jWo- delta 1126 zcmXAne@v8h9LL|!Jw?YMk4C0r(2wyH|)uh-rX)7`VI!kX|4*{LiH%Vg%KH0(M3$1WFyiKmlZx6M*Fb zgyy|KR33zZUf{l8?NzNN4Z@9TDqTOj5gr8*Vj z=K`=T2jZzr;A|k|tvuj854oErc^^W)+&S_ONHNJYS%kFw|9}yk*p0bi38fcJX>{6|3h>hK-`dzXND25+hHOyJ?5GIhNRZ zS4`k%Xf0Lj7Oz#f#HtR;YDUAJ@;YtfAl(R_6Hizuw_P{HW`9~h-2w|2tcFhU+9c_{ zzgK)VF%8%T<-r=tY3qLZ`ub#GmS@#M821}HCuq48HX`T^HYrJd8%W5JQeQ6tuEt3F zJ?jAGk}AvxfIcOAPK;KVrG+nF19rd3wu^f1A}bTE+)dUchH>rej%YF@DArZH2kZ<~ zycGQfQ2xClBmEgLHmb<@jMV)*!Pd+5TtC}P-&$5E*BcrXV;jhMZmcq-vK$yZtTdMl z0_h1#+dGrwwSl$EO@`abQv%(ZYggXQO9Z+We1c13f$bGOA=$LwsV8hv9>(dIQL<`A zRu)w)0zUbr(khB?nYzZRDzHLe+a| zx!$6h*PRExp7-^=PFnJ3d?RN4=nYn|N0Ldi&$nluvJD;f9i1c2#4_Uw{l+)cw)T^N zvswLCNGK4JsygB70auDHC{dL9RkkvsOR0|ly6o6u(XE< zv_E(>ha56CwmO8>RIg#hb-kV`pRORjz?tPa9{y{*-`d0ydv>nF5s+Py<;c&?2`J6? f94h<$MOi_vC+E1!#5J&S?@uhM&+Hkv91!szdT49o diff --git a/gui/gpsbabelfe_es.ts b/gui/gpsbabelfe_es.ts index ff207c7f5..4d8f30d99 100644 --- a/gui/gpsbabelfe_es.ts +++ b/gui/gpsbabelfe_es.ts @@ -212,7 +212,7 @@ p, li { white-space: pre-wrap; } Debugging diagnostics. -Higher number provides more deitaled diagnostics. +Higher number provides more detailed diagnostics. Depurar errores. Cuanto mayor es el número, el diagnóstico es más detallado. @@ -535,31 +535,31 @@ p, li { white-space: pre-wrap; } Defecto - + Select one or more input files Seleccionar uno o más archivos de entrada - + Output File Name Nombre del fichero de salida - + Error reading format configuration. Check that the backend program "gpsbabel" is properly installed and is in the current PATH This program cannot continue. Se ha producido un error cuando se intentaba leer la configuración. Compruebe que el núcleo de "gpsbabel" está instalado correctamente y que se halla en la RUTA actual. Este programa no puede continuar. - + Some file/device formats were not found during initialization. Check that the backend program "gpsbabel" is properly installed and is in the current PATH This program cannot continue. El formato de alfunos ficheros o dispositivos no se halló durante la inicialización. Compruebe que el núcleo de "gpsbabel" está instalado correctamente y que se halla en la RUTA actual. Este programa no puede continuar. - + Input and output formats do not support %1 Formatos de entrada y salida inadmisibles %1 @@ -568,109 +568,109 @@ This program cannot continue. Formatos de entrada inadmisible %1; Formatos de salida inadmisible %2 - + Input does not support %1; output format supports %1 Formatos de entrada inadmisible %1; Formatos de salida inadmisible %1 {1;?} - + Input format supports %1; output format does not support %1 - + Both input and output formats support %1 Formatos de entrada y salida admisibles (ambos) %1 - + waypoints Puntos de interés - + tracks Registro de trazados - + routes Rutas - + There are no input options for format "%1" No hay opciones de entrada para el formato "%1" - - + + Options for %1 Opciones de %1 - + There are no output options for format "%1" No hay opciones de salida para el formato "%1" - + No valid waypoints/routes/tracks translation specified Se han especificicado puntos de interés, trazados o rutas no traducibles - + No input file specified No se ha especificado el fichero de entrada - + No valid output specified El fichero de salida no es válido - + No output file specified No se ha especificado el fichero de salida - + Process "%1" did not start El proceso "%1" no comenzó - + Process exited unsuccessfully with code %1 El proceso terminó sin suerte y con el código %1 - + Translation successful Traducción realizada con éxito - + Error running gpsbabel: %1 Error ejecutando gpsbabel: %1 - + Are you sure you want to reset all format options to default values? ¿Estás seguro de que quieres volver a los formatos por defecto? - + About %1 Acerca de %1 - + One or more data filters are active Uno o más filtros de datos están activos - + No data filters are active Ningún filtro de datos está activo @@ -928,28 +928,28 @@ This program cannot continue. MiscFltWidget - - - - + + + + Tracks Trazados - - + + Waypoints Puntos de interés - - + + Routes Rutas @@ -1171,13 +1171,13 @@ Algunos formatos de datos de los GPS solo permiten utilizar una parte de los pun Parar el proceso - + Process did not terminate successfully El proceso no terminó como se esperaba - - Process crashed whle running + + Process crashed while running El proceso falló cuando estaba ejecutándose @@ -1275,7 +1275,7 @@ La calidad de los resultados variará dependiendo del número de puntos que cont - The reversal is performed in the laziest way possible. Timestamps are kept with the original waypoints so the resulting track or route will have the interesting characteristic that time runs backwards. This tends to make Magellan Mapsend, in particular, do a wierd thing and place each waypoint on a separate day. + The reversal is performed in the laziest way possible. Timestamps are kept with the original waypoints so the resulting track or route will have the interesting characteristic that time runs backwards. This tends to make Magellan Mapsend, in particular, do a weird thing and place each waypoint on a separate day. Additionally, if you're using this to reverse a route that navigates, say, an exit ramp or a one way street, you will be in for unpleasant ride. application cares about timestamps La inversión es realizada de la manera más simple posible. Los tiempos de marca de los puntos originales se guardan tal cual de tal forma que el trazado o la ruta resultantes tendrá características curiosas cuando el tiempo va para atrás. Esto hace que, sobre todo, Magellan Mapasend haga cosas raras como poner cada punto de interés en un día diferente. Además, si se utiliza este filtro para navegar por una ruta invertida que se mueve, por ejemplo una rampa de salida o una calle de sentido único, puedes encontrarte con un viaje poco apacible. Al programa le importan los tiempos de marca @@ -1338,35 +1338,40 @@ This option changes the time of all trackpoints. This might be useful if your tr Mover - - + + weeks + + + + + days días - + hours horas - - + + mins minutos - + secs segundos - - + + Use track pts. after this time. Usar sólo los puntos del trazado grabados después de esta hora. - + Use only track points after this timestamp. This option is used along with the stop to discard trackpoints that were recorded outside of a specific period of time. This option specifies the beginning of the time period. @@ -1375,50 +1380,50 @@ This option is used along with the stop to discard trackpoints that were recorde Esta opción se utiliza junto con la de parar (stop) para descartar puntos que fueron grabados fuera del período de tiempo deseado. La opción especifica el inicio del período. - + Start Comenzar - + If checked, time specified here is based on this computer's current time zone. Si seleccionado, los datos especificados se basan en la zona horaria de tu ordenador. - + If checked, the times specified here are based on the local computer's time zone. Otherwise it is UTC. Si seleccionado, los datos especificados se basan en la zona horaria de tu ordenador. En caso contrario, es UTC. - + Local Time Hora local - - + + Use track pts before this time. Usa los puntos del trazado tomados antes de esta hora. - + Use only track points before this timestamp. This option is used in conjunction with the start option to discard all trackpoints outside of a given period of time. This option defines the end of the time period. Usa los puntos del trazado tomados antes de esta marca de tiempo. Esta opción se usa junto con la opción comenzar para descartar todos los puntos no tomados en determinado período temporal. Esta opción define el final del período. - + Stop Parar - + Pack all tracks into one. Junta todos los trazados en uno. - + Pack all tracks into one. This option causes all tracks to be appended to one another to form a single track. This option does not work if any two tracks overlap in time; in that case, consider using the merge option. @@ -1431,17 +1436,17 @@ Esta opción hace que todos los trazados se añadan uno tras otros hasta formar Esta opción es muy útil para juntar trazados que se interrumpieron por un error en el equipo o por una parada para descansar. - + Pack Juntar - + Merge multiple tracks for the same way. Unir diversos trazados repetitivos. - + Merge multiple tracks for the same way. This option puts all track points from all tracks into a single track and sorts them by time stamp. Points with identical time stamps will be dropped. @@ -1450,12 +1455,12 @@ This option puts all track points from all tracks into a single track and sorts Esta opción pone todos los puntos de todos los trazados en un único trazado y los ordena por la marca de tiempo. Los puntos con idénticas marcas de tiempo son borrados. - + Merge Unir - + Split by Date Split tracks. Dividir trazados por fecha @@ -1478,42 +1483,42 @@ Si la entrada tiene múltiples trazados, júntalos antes de dividirlos por día. Dividir - + If nonzero, the track will be split if the time between two points is greater than this parameter. If zero, the track will be split by date. Si "nonzero", el trazado será dividido si el tiempo entre dos puntos es mayor que el parámetro. Si "zero", el trazado será dividido por día. - + hrs hrs - + Split by Dist. Dividir trazados por distancia. - + If nonzero, the input track will be split into several tracks if the distance between successive track points is greater than the distance given as a parameter. Si "nonzero", el trazado será dividido en varios trazados si la distancia entre dos puntos es mayor que el parámetro dado. - + ft ft - + m m - + km Km - + mi mi @@ -1535,42 +1540,42 @@ Esta opción fija el estatus de las correcciones GPS de todos los puntos del tra Esta opción es muy útil cuando se trata de convertir de un formato que no contiene ninguna corrección GPS a uno que la requiere. - + GPS Fixes Correcciones GPS - + none ninguno - + pps pps - + dgps dgps - + 3d 3d - + 2d 2d - + Synthesize course. Sintetizar el rumbo. - + Synthesize course. This option computes (or recomputes) a value for the GPS heading at each trackpoint. This is most useful with trackpoints from formats that don't support heading information or for trackpoints synthesized by the interpolate filter. The heading at each trackpoint is simply the course from the previous trackpoint in the track. The first trackpoint in each track is arbitrarily assigned a heading of 0 degrees. @@ -1579,31 +1584,31 @@ This option computes (or recomputes) a value for the GPS heading at each trackpo Esta opción calcula (o recalcula) un valor para el rumbo de cada punto del trazado. Es muy útil para puntos de trazado en formatos que no contienen información sobre el rumbo o para puntos de trazado calculados con el filtro interpolar. El rumbo de cada punto es simplemente la dirección desde el punto previo en el trazado. El primer punto de cada trazado tiene el valor arbitrario de 0 grados. - + Course Dirección - + Synthesize speed. Calcular velocidad. - + Split by Time Dividir trazados en función del tiempo - + Synthesize speed. -This option computes a value for the GPS speed at each trackpoint. This is most useful with trackpoints from formats that don't support speed information or for trackoints synthesized by the interpolate filter. The speed at each trackpoint is the average speed from the previous trackpoint (distance divided by time). The first trackpoint in each track is assigned a speed of "unknown." +This option computes a value for the GPS speed at each trackpoint. This is most useful with trackpoints from formats that don't support speed information or for trackpoints synthesized by the interpolate filter. The speed at each trackpoint is the average speed from the previous trackpoint (distance divided by time). The first trackpoint in each track is assigned a speed of "unknown." Sintetizar la veloclidad. Esta opción calcula (o recalcula) un valor para la velocidad de cada punto del trazado. Es muy útil para puntos de trazado en formatos que no contienen información sobre la velocidad o para puntos de trazado calculados con el filtro interpolar. La velocidad de cada punto es simplemente la media (distancia partido por tiempo) desde el punto previo en el trazado. El primer punto de cada trazado tiene el valor arbitrario de "desconocido". - + Speed Velocidad diff --git a/gui/gpsbabelfe_fr.ts b/gui/gpsbabelfe_fr.ts index 13a266c80..748064fa3 100644 --- a/gui/gpsbabelfe_fr.ts +++ b/gui/gpsbabelfe_fr.ts @@ -153,7 +153,7 @@ p, li { white-space: pre-wrap; } Debugging diagnostics. -Higher number provides more deitaled diagnostics. +Higher number provides more detailed diagnostics. @@ -470,138 +470,138 @@ p, li { white-space: pre-wrap; } MainWindow - + Select one or more input files - + Output File Name - + Error reading format configuration. Check that the backend program "gpsbabel" is properly installed and is in the current PATH This program cannot continue. - + Some file/device formats were not found during initialization. Check that the backend program "gpsbabel" is properly installed and is in the current PATH This program cannot continue. - + Input and output formats do not support %1 - + Input does not support %1; output format supports %1 - + Input format supports %1; output format does not support %1 - + Both input and output formats support %1 - + waypoints - + tracks - + routes - + There are no input options for format "%1" - - + + Options for %1 Options pour %1 - + There are no output options for format "%1" - + No valid waypoints/routes/tracks translation specified - + No input file specified - + No valid output specified - + No output file specified - + Process "%1" did not start - + Process exited unsuccessfully with code %1 - + Translation successful - + Error running gpsbabel: %1 - + Are you sure you want to reset all format options to default values? - + About %1 - + One or more data filters are active - + No data filters are active @@ -851,28 +851,28 @@ This program cannot continue. MiscFltWidget - - - - + + + + Tracks Traces - - + + Waypoints Waypoints - - + + Routes Routes @@ -1091,13 +1091,13 @@ Some GPS data formats support only some subset of waypoints, tracks, and routes. - + Process did not terminate successfully - - Process crashed whle running + + Process crashed while running @@ -1184,7 +1184,7 @@ The quality of the results will vary depending on the density of points in the o - The reversal is performed in the laziest way possible. Timestamps are kept with the original waypoints so the resulting track or route will have the interesting characteristic that time runs backwards. This tends to make Magellan Mapsend, in particular, do a wierd thing and place each waypoint on a separate day. + The reversal is performed in the laziest way possible. Timestamps are kept with the original waypoints so the resulting track or route will have the interesting characteristic that time runs backwards. This tends to make Magellan Mapsend, in particular, do a weird thing and place each waypoint on a separate day. Additionally, if you're using this to reverse a route that navigates, say, an exit ramp or a one way street, you will be in for unpleasant ride. application cares about timestamps @@ -1245,85 +1245,90 @@ This option changes the time of all trackpoints. This might be useful if your tr - - + + weeks + + + + + days - + hours - - + + mins - + secs - - + + Use track pts. after this time. - + Use only track points after this timestamp. This option is used along with the stop to discard trackpoints that were recorded outside of a specific period of time. This option specifies the beginning of the time period. - + Start - + If checked, time specified here is based on this computer's current time zone. - + If checked, the times specified here are based on the local computer's time zone. Otherwise it is UTC. - + Local Time - - + + Use track pts before this time. - + Use only track points before this timestamp. This option is used in conjunction with the start option to discard all trackpoints outside of a given period of time. This option defines the end of the time period. - + Stop - + Pack all tracks into one. - + Pack all tracks into one. This option causes all tracks to be appended to one another to form a single track. This option does not work if any two tracks overlap in time; in that case, consider using the merge option. @@ -1332,139 +1337,139 @@ This option is most useful for rejoining tracks that might have been interrupted - + Pack - + Merge multiple tracks for the same way. - + Merge multiple tracks for the same way. This option puts all track points from all tracks into a single track and sorts them by time stamp. Points with identical time stamps will be dropped. - + Merge - + Split by Date Split tracks. - + If nonzero, the track will be split if the time between two points is greater than this parameter. If zero, the track will be split by date. - + hrs - + Split by Dist. - + If nonzero, the input track will be split into several tracks if the distance between successive track points is greater than the distance given as a parameter. - + ft - + m - + km - + mi - + GPS Fixes - + none - + pps - + dgps - + 3d - + 2d - + Synthesize course. - + Synthesize course. This option computes (or recomputes) a value for the GPS heading at each trackpoint. This is most useful with trackpoints from formats that don't support heading information or for trackpoints synthesized by the interpolate filter. The heading at each trackpoint is simply the course from the previous trackpoint in the track. The first trackpoint in each track is arbitrarily assigned a heading of 0 degrees. - + Course - + Synthesize speed. - + Split by Time - + Synthesize speed. -This option computes a value for the GPS speed at each trackpoint. This is most useful with trackpoints from formats that don't support speed information or for trackoints synthesized by the interpolate filter. The speed at each trackpoint is the average speed from the previous trackpoint (distance divided by time). The first trackpoint in each track is assigned a speed of "unknown." +This option computes a value for the GPS speed at each trackpoint. This is most useful with trackpoints from formats that don't support speed information or for trackpoints synthesized by the interpolate filter. The speed at each trackpoint is the average speed from the previous trackpoint (distance divided by time). The first trackpoint in each track is assigned a speed of "unknown." - + Speed diff --git a/gui/gpsbabelfe_hu.ts b/gui/gpsbabelfe_hu.ts index 2037ac3ef..10da52e33 100644 --- a/gui/gpsbabelfe_hu.ts +++ b/gui/gpsbabelfe_hu.ts @@ -153,7 +153,7 @@ p, li { white-space: pre-wrap; } Debugging diagnostics. -Higher number provides more deitaled diagnostics. +Higher number provides more detailed diagnostics. @@ -470,138 +470,138 @@ p, li { white-space: pre-wrap; } MainWindow - + Select one or more input files - + Output File Name - + Error reading format configuration. Check that the backend program "gpsbabel" is properly installed and is in the current PATH This program cannot continue. - + Some file/device formats were not found during initialization. Check that the backend program "gpsbabel" is properly installed and is in the current PATH This program cannot continue. - + Input and output formats do not support %1 - + Input does not support %1; output format supports %1 - + Input format supports %1; output format does not support %1 - + Both input and output formats support %1 - + waypoints - + tracks - + routes - + There are no input options for format "%1" - - + + Options for %1 - + There are no output options for format "%1" - + No valid waypoints/routes/tracks translation specified - + No input file specified - + No valid output specified - + No output file specified - + Process "%1" did not start - + Process exited unsuccessfully with code %1 - + Translation successful - + Error running gpsbabel: %1 - + Are you sure you want to reset all format options to default values? - + About %1 - + One or more data filters are active - + No data filters are active @@ -846,28 +846,28 @@ This program cannot continue. MiscFltWidget - - - - + + + + Tracks Nyomvonalak - - + + Waypoints Útpontok - - + + Routes Útvonalak @@ -1086,13 +1086,13 @@ Some GPS data formats support only some subset of waypoints, tracks, and routes. - + Process did not terminate successfully - - Process crashed whle running + + Process crashed while running @@ -1179,7 +1179,7 @@ The quality of the results will vary depending on the density of points in the o - The reversal is performed in the laziest way possible. Timestamps are kept with the original waypoints so the resulting track or route will have the interesting characteristic that time runs backwards. This tends to make Magellan Mapsend, in particular, do a wierd thing and place each waypoint on a separate day. + The reversal is performed in the laziest way possible. Timestamps are kept with the original waypoints so the resulting track or route will have the interesting characteristic that time runs backwards. This tends to make Magellan Mapsend, in particular, do a weird thing and place each waypoint on a separate day. Additionally, if you're using this to reverse a route that navigates, say, an exit ramp or a one way street, you will be in for unpleasant ride. application cares about timestamps @@ -1240,85 +1240,90 @@ This option changes the time of all trackpoints. This might be useful if your tr - - + + weeks + + + + + days - + hours - - + + mins - + secs - - + + Use track pts. after this time. - + Use only track points after this timestamp. This option is used along with the stop to discard trackpoints that were recorded outside of a specific period of time. This option specifies the beginning of the time period. - + Start - + If checked, time specified here is based on this computer's current time zone. - + If checked, the times specified here are based on the local computer's time zone. Otherwise it is UTC. - + Local Time - - + + Use track pts before this time. - + Use only track points before this timestamp. This option is used in conjunction with the start option to discard all trackpoints outside of a given period of time. This option defines the end of the time period. - + Stop - + Pack all tracks into one. - + Pack all tracks into one. This option causes all tracks to be appended to one another to form a single track. This option does not work if any two tracks overlap in time; in that case, consider using the merge option. @@ -1327,139 +1332,139 @@ This option is most useful for rejoining tracks that might have been interrupted - + Pack - + Merge multiple tracks for the same way. - + Merge multiple tracks for the same way. This option puts all track points from all tracks into a single track and sorts them by time stamp. Points with identical time stamps will be dropped. - + Merge - + Split by Date Split tracks. - + If nonzero, the track will be split if the time between two points is greater than this parameter. If zero, the track will be split by date. - + hrs - + Split by Dist. - + If nonzero, the input track will be split into several tracks if the distance between successive track points is greater than the distance given as a parameter. - + ft - + m - + km - + mi - + GPS Fixes - + none - + pps - + dgps - + 3d - + 2d - + Synthesize course. - + Synthesize course. This option computes (or recomputes) a value for the GPS heading at each trackpoint. This is most useful with trackpoints from formats that don't support heading information or for trackpoints synthesized by the interpolate filter. The heading at each trackpoint is simply the course from the previous trackpoint in the track. The first trackpoint in each track is arbitrarily assigned a heading of 0 degrees. - + Course - + Synthesize speed. - + Split by Time - + Synthesize speed. -This option computes a value for the GPS speed at each trackpoint. This is most useful with trackpoints from formats that don't support speed information or for trackoints synthesized by the interpolate filter. The speed at each trackpoint is the average speed from the previous trackpoint (distance divided by time). The first trackpoint in each track is assigned a speed of "unknown." +This option computes a value for the GPS speed at each trackpoint. This is most useful with trackpoints from formats that don't support speed information or for trackpoints synthesized by the interpolate filter. The speed at each trackpoint is the average speed from the previous trackpoint (distance divided by time). The first trackpoint in each track is assigned a speed of "unknown." - + Speed diff --git a/gui/gpsbabelfe_it.qm b/gui/gpsbabelfe_it.qm index ee5ac0614b533ae1dad08d0453a245fcde2025d9..0db2bafca9bfa50c7eb60117da43b43df3c424b0 100644 GIT binary patch delta 1147 zcmW+#drZ?;6#jm%{?=k)Ag*Z)mckGnOa_Aj(*d#+ba4SvMT9|6=&+N3DKK=+L^EC* zMe**zct(i?VK%VNIdM!j5iz4|^47S_$JCg`P3(vc2JWzb?w6B$&OP7vopU=|#4|18 zvEprYfKU#!?;`w!uoh5^0VB@<*#{W4{*RojCXA-|0#L{ZHv*+az}Q>hEAIkvT8M3X zfdmW0pZb9(t+h^#rw!u75eh~iUOxs*RoBkw%8o)xxD1@X0V&l8MD2i-*8udWARQKg z9Ev-$fxZ(^oEC^lBNTS(G%^Im;>*TgA;+1B!EMNk^<$op8(InTp)I}z)ZIl~b_-!A z*86P*KDvR#SBP1CEjE3z19*EX6{g%~V5S77!Eqwujm`WeVD>YlU8M#wy-45nHE?k~ z(%Z?BzTL=h3jmyZk=^nb_~thh<})I&f{k;Ls}G^J-y6utLVLiUr130HKd=F3TH#1j z0!c&Yug;<_Mi#*bhB~=QziuF_kvofIV5ox+c=jUjLkJ&|zyTXMKI)AWV2h29S#SaS z!`KmCA9C$Exi|2XpEo$j&G!UpfNGwG3tsEUs1a|$Z+aAn-!BB{_5t(D*f<}n-5?Bf zNW@+*T(N&jYCaI|^!x&j-@slKH2NxWkD(mMTq@dLqPNl>i52!x;D8{uU8U^q%gik3 zxI3&u2-Igt2JbH5REo6jOVT}Smfndc?4FmBgvT_vIOY^I%0p6B7r8hmut$Pc*ATo0 zhU1~Luv-_r{Hg6hLy_5Nfk;*CQ=ZD1GC9q6U!!2heVu*H7aWaf%LreIF zhI~jpu2_hA4Y*d$dPSYyB&R5T2exI&Tcc<(C%ohX4u7D*Dwl_T3=Dg*c`;TwBL7_% z4wTh1qom_HnOTbDCRh`lJ#1VG)F&wY%ije)ELN_JtpTd@l^N*^!2L;O#=%x_iWAI7 zq2rp_n{-CAOodMGRNgd_0|m3H;L0*!(xeKt4gsX9f{+Eg8bmC=ic_E4y$-OAtG|sQb#|4ye{eBwR=c!)z{#8L?xV!X zn(7`sy_B}KgN@69p6A?ubdkqVHSUv720&7(sO%a=cWS7T~;dT1N zB_1yOE%MQ90VjtGfPRzX-`fv3N0v$%Arx=7INpz4nYh9y*;<%mE-LcPv2HKgY0mX6 v-D$};`&vs13M>VAY)!>-$6)0_f8K0ym^yk_ai25K(etcyILt9O+O_sSs(ov% delta 1128 zcmW+#YfzMB6n?(_ZtZeeZnd*BHp>Ttivc>ATpW=l3iy$ZD5zYNK^F#r#x*X3$sk#X zG9w1QLJBA)MqFe^+OS}TB%@7gCE_AcQ7EP34-MTgL!l1+d7nA+p7%M=dCqyenuX40 zp{6Lc9^fm0wmibqgf)OP4vanq)d)Mh~I& zEg(J@!gqtfqYrCu=sXWWxLHlX2!tsj{;{%l-cVi*G5%|ycM9T;I3RK_#GFQ;PYv;e z0GKK6%mfBLfYi>Dk_JdtsxD&UC+@a1Y&rqXettWKpE7sGAjRTeMW>E`dXyjK+2 zFzUtoJscz1Z}S0$!@#09`$J{Y$Mg0Mku>`9-&pHNb1{FrZv>nwo^9lH%2DB9cm=TA zTPS^jxKi#5N3Eg25tYz7MA_Ygte7`&Gpvp`Dyd?)&t>4FL^0|Tb+=#^H^&loKNGj` zb2Jtco91=uD)HE5^6Dwa7J0qy+%RQ?S;dxc^6l`P*y=+AXmGGFAwroHzrRO%ot(Hd z`zMg_L<;gGpLUf=A$3W>Gd-&o)^K*#FX*^;*o0tEw#i$i-+|N&d1qt+aMMFRV)F+Y z-;^st-vx#}*z=-E{e%41nRP(jk+R8RIFB?6txLTCm#_$ zUB^P6GraDnjqdswDEmqKYVc~B)W2E_EWieh_FPypkm%H2asp@y)H=dnrq5ffof#Sd z?2olh>kK(=&IKp098~y{P5NZhk diff --git a/gui/gpsbabelfe_it.ts b/gui/gpsbabelfe_it.ts index 45459a718..24ab118b9 100644 --- a/gui/gpsbabelfe_it.ts +++ b/gui/gpsbabelfe_it.ts @@ -108,7 +108,7 @@ Questo programma &egrave; software libero; è possibile distribuirlo e/o mod Debugging diagnostics. -Higher number provides more deitaled diagnostics. +Higher number provides more detailed diagnostics. Diagnosi di debug. Un numero più alto fornisce un livello di diagnosi più dettagliato. @@ -688,17 +688,17 @@ p, li { white-space: pre-wrap; } predefinite - + Select one or more input files Selezionare uno o più file in ingresso - + Output File Name Nome del file in uscita - + Error reading format configuration. Check that the backend program "gpsbabel" is properly installed and is in the current PATH This program cannot continue. @@ -707,7 +707,7 @@ This program cannot continue. Questo programma non può proseguire. - + Some file/device formats were not found during initialization. Check that the backend program "gpsbabel" is properly installed and is in the current PATH This program cannot continue. @@ -716,7 +716,7 @@ This program cannot continue. Questo programma non può proseguire. - + Input and output formats do not support %1 I formati di ingresso e di uscita non supportano %1 @@ -729,110 +729,110 @@ Questo programma non può proseguire. Il formato in ingresso supporta %1, il formato di destinazione non supporta %2 - + Input does not support %1; output format supports %1 L'ingresso non supporta %1, il formato di destinazione supporta %1 {1;?} - + Input format supports %1; output format does not support %1 Il formato in ingresso supporta %1, il formato di destinazione non supporta %1 {1;?} - + Both input and output formats support %1 I formati di origine e di destinazione supportano %1 - + waypoints punti di interesse - + tracks tracce - + routes rotte - + There are no input options for format "%1" Non ci sono opzioni in ingresso per il formato "%1" - - + + Options for %1 Opzioni per %1 - + There are no output options for format "%1" Non ci sono opzioni in uscita per il formato "%1" - + No valid waypoints/routes/tracks translation specified Non è stato specificato alcun punto di interesse/rotta/traccia - + No input file specified Il file di origine non è stato specificato - + No valid output specified Non è stata specificata una destinazione valida - + No output file specified Il file di destinazione non è stato specificato - + Process "%1" did not start Il processo "%1" non è stato avviato - + Process exited unsuccessfully with code %1 Il processo è terminato con il codice di errorre %1 - + Translation successful Traduzione terminata con successo - + Error running gpsbabel: %1 Errore durante l'esecuzione di gpsbabel: %1 - + Are you sure you want to reset all format options to default values? Si è certi di voler reimpostare tutte le opzioni dei formati ai valori predefiniti? - + About %1 Informazioni su %1 - + One or more data filters are active È attivo uno o più filtri di dati - + No data filters are active Nessun filtro di dati è attivo @@ -869,28 +869,28 @@ Questo programma non può proseguire. - - + + Routes Rotte - - - - + + + + Tracks Tracce - - + + Waypoints Punti di interesse @@ -1096,13 +1096,13 @@ Qualche formato di dati del GPS supporta solo un sottoinsieme di punti di intere Arresta il processo - + Process did not terminate successfully Il processo non è terminato correttamente - - Process crashed whle running + + Process crashed while running Il processo si è interrotto @@ -1195,7 +1195,7 @@ La qualità dei risultati dipenderà dalla densità dei punti e dalla lunghezza - The reversal is performed in the laziest way possible. Timestamps are kept with the original waypoints so the resulting track or route will have the interesting characteristic that time runs backwards. This tends to make Magellan Mapsend, in particular, do a wierd thing and place each waypoint on a separate day. + The reversal is performed in the laziest way possible. Timestamps are kept with the original waypoints so the resulting track or route will have the interesting characteristic that time runs backwards. This tends to make Magellan Mapsend, in particular, do a weird thing and place each waypoint on a separate day. Additionally, if you're using this to reverse a route that navigates, say, an exit ramp or a one way street, you will be in for unpleasant ride. application cares about timestamps L'inversione è effettuata nel modo più pigro possibile. Date ed ore sono mantenute con i punti di interesse originali in modo che la traccia o rotta risultante avrà la caratteristica interessante che il tempo scorre all'indietro. Questo comporta, in particolare, che Magellan MapSend si comporti in modo strano e inserisca ogni punti di interesse in un giorno diverso. Inoltre, se stai usando questa operazione per invertire una rotta che percorre, ad esempio, una rampa di uscita o una strada a senso unico, potrai incappare in un giro poco piacevoli. L'applicazione si preoccupa di data e ora @@ -1265,35 +1265,40 @@ Questa opzione modifica la data/l'ora di tutti i punti traccia. Può essere Sposta - - + + weeks + + + + + days giorni - + hours ore - - + + mins minuti - + secs secondi - - + + Use track pts. after this time. Usa i punti traccia dopo quest'ora. - + Use only track points after this timestamp. This option is used along with the stop to discard trackpoints that were recorded outside of a specific period of time. This option specifies the beginning of the time period. @@ -1302,33 +1307,33 @@ This option is used along with the stop to discard trackpoints that were recorde Questa opzione viene usata congiuntamente con lo stop per scartare i punti traccia che sono stati salvati al di fuori di uno specifico intervallo temporale. Questa opzione specifica l'inizio dell'intervallo temporale. - + Start Inizio - + If checked, time specified here is based on this computer's current time zone. Se selezionato, l'ora indicata qui è basata sul fuso orario impostato nel PC. - + If checked, the times specified here are based on the local computer's time zone. Otherwise it is UTC. Se selezionato, gli orari specificati qui sono basati sul fuso orario del computer. Altrimenti saranno in UTC (fuso di Greenwich). - + Local Time Tempo locale - - + + Use track pts before this time. Usa i punti traccia prima di quest'ora. - + Use only track points before this timestamp. This option is used in conjunction with the start option to discard all trackpoints outside of a given period of time. This option defines the end of the time period. @@ -1337,17 +1342,17 @@ This option is used in conjunction with the start option to discard all trackpoi Questa opzione viene usata congiuntamente con l'inizio per scartare i punti traccia che sono stati salvati al di fuori di uno specifico intervallo temporale. Questa opzione specifica la fine dell'intervallo temporale. - + Stop Fine - + Pack all tracks into one. Concatena tutte le tracce in una. - + Pack all tracks into one. This option causes all tracks to be appended to one another to form a single track. This option does not work if any two tracks overlap in time; in that case, consider using the merge option. @@ -1360,17 +1365,17 @@ Questa opzione fa in modo che tutte le tracce vengano unite per formarne una sol Questa opzione è utile soprattutto per unire tracce che si sono interrotte per un malfunzionamento del dispositivo o per un arresto notturno. - + Pack Concatena - + Merge multiple tracks for the same way. Unisci più tracce per la stessa strada. - + Merge multiple tracks for the same way. This option puts all track points from all tracks into a single track and sorts them by time stamp. Points with identical time stamps will be dropped. @@ -1379,116 +1384,116 @@ This option puts all track points from all tracks into a single track and sorts Questa opzione inserisce tutti i punti di ogni traccia in una singola traccia e li ordina in base all'orario. I punti con lo stesso orario saranno tralasciati. - + Merge Unisci - + Split by Date Suddividi per data - + Split by Time Suddividi per ora - + If nonzero, the track will be split if the time between two points is greater than this parameter. If zero, the track will be split by date. Se diverso da zero, la traccia verrà suddivisa se il tempo tra due punti è maggiore di questo parametro. Se zero, la traccia verrà suddivisa in base al giorno. - + hrs ore - + Split by Dist. Suddividi per distanza - + If nonzero, the input track will be split into several tracks if the distance between successive track points is greater than the distance given as a parameter. Se non zero, la traccia in ingresso verrà suddivisa in più tracce se la distanza tra punti traccia successivi è maggiore della distanza specificata nel parametro. - + ft ft - + m m - + km km - + mi mi - + GPS Fixes Stato del GPS - + none nessuno - + pps pps - + dgps dgps - + 3d 3d - + 2d 2d - + Synthesize speed. Sintetizza la velocità. - + Synthesize speed. -This option computes a value for the GPS speed at each trackpoint. This is most useful with trackpoints from formats that don't support speed information or for trackoints synthesized by the interpolate filter. The speed at each trackpoint is the average speed from the previous trackpoint (distance divided by time). The first trackpoint in each track is assigned a speed of "unknown." +This option computes a value for the GPS speed at each trackpoint. This is most useful with trackpoints from formats that don't support speed information or for trackpoints synthesized by the interpolate filter. The speed at each trackpoint is the average speed from the previous trackpoint (distance divided by time). The first trackpoint in each track is assigned a speed of "unknown." Sintetizza la velocità. Questa opzione calcola il valore della velocità GPS in ogni punto traccia. Risulta utile soprattutto con punti traccia tratti da un formato che non specifica informazioni sulla velocità o da punti traccia sintetizzati dal filtro di interpolazione. La velocità in ogni punto traccia è la velocità media calcolata dal punto precedente (distanza diviso il tempo). Al primo punto di ogni traccia viene assegnata una velocità "sconosciuta." - + Speed Velocità - + Synthesize course. Sintetizza la direzione. - + Synthesize course. This option computes (or recomputes) a value for the GPS heading at each trackpoint. This is most useful with trackpoints from formats that don't support heading information or for trackpoints synthesized by the interpolate filter. The heading at each trackpoint is simply the course from the previous trackpoint in the track. The first trackpoint in each track is arbitrarily assigned a heading of 0 degrees. @@ -1497,7 +1502,7 @@ This option computes (or recomputes) a value for the GPS heading at each trackpo Questa opzione calcola (o ricalcola) un valore per la direzione del GPS in ogni punto traccia. Risulta utile soprattutto con punti traccia tratti da un formato che non specifica informazioni sulla direzione o da punti traccia sintetizzati dal filtro di interpolazione. La direzione in ogni punto traccia è tratta semplicemente dalla posizione del punto traccia precedente nella traccia stessa. Al primo punto di ogni traccia viene arbitrariamente assegnato un valore pari a 0 gradi. - + Course Direzione diff --git a/gui/gpsbabelfe_ru.qm b/gui/gpsbabelfe_ru.qm index a4e68652de6e02c354ea0c997c80f4645312341c..9e7950dc314608e9a7d887da7a632f7bc149eb59 100644 GIT binary patch delta 1133 zcmX9-e@xVM7=FILyMyB*!HYI_97bedbO;ADekp=m;lz+1Lcl59j!P8Bk5Jh%ewrJa z^a0DU%cjC018FBnwU)wpKq%_qA~x47HL^f3aMPUB%lhZ@?EQS-&-*;@^S<8)wcU{VGJ;=147sIA+Jkhsu|9Y z@`=UDBKcrr0oNG#HIOsO^&t(ol*0!-ex5ik@?j|)kdn?vzqt)~r;v|dUIY%B*-_pQ zcJp6y@4K!1Gn0edEEXgez4>EVcp;XIx>6zpKAZp&BZMIR2f+L)=H?Up{t;YXNgjW)bwh@7V-t%SOV^32CdaK!Yn`*94vFgmk!f#l@R!PVm#Wg}x3%)JgVn z%8YnbI%6Vd4>U_1J~S%!g!zk6swV0BebRkTV0ogBn`f0`nBNKcbU4k1mhdkf`H*gw zm!sbRoIkVgMZH0*Y?JQ-nb}HKbQv)EqEh2n1GF?M^~O4y&Xn3JK+O$RZq70=ZB^wSA$5-}%wN`Xzpywu z*RniWZ?LIuC6fd1eW(s?JOuohp*EJ$k5MqCj?cIc%w;pX9Bkm!=S0eyzoY)$nnwF$ z^$4lj2o$P4LJMgFW=^tuau_$ne3d9~wddZ$kASO@p4B$`)|bWd6dgCtDiy=#l11vj z)u^d>5&)F%(tI33D!Y6%7x%>i??2TH#8Y?eWg6$mO6=4u`dtFrOkQ3Sq-oEHSIomz z$z3wIuoYrieaePh->~b0;g0U%%Q61}xPoH> delta 1132 zcmX9-dr(w$6#nksd-t{ryBqP?p~oz%(PltMuuC+&2Bc;Ri-v~?g~;+0Yl}xrqS#$Iu^v)( z7ugQBO!a(G#9zSfmWvvkm-k>z&ljF6}@vcK-XWeXDWc?TsZgV z5KAG8ks17RxTbYq0a=$g2U37DnX3N;KgQTasI2k>r0U|+W29cmC%F#{k!wPay5(Lwfa(_+SCAS zO%!VUs8;%f&}a(-YJ7z5QOfS=VwJp(yUDD)L2ndIK7ByPAu;+mb$2^P+?+tzb3uHC zU!<{=vT0tcu!{To++K~dHQry_agH(~o)kMxNv8Dp^^Q>72<=WT}f|i?P6M{~!mR^-#2Qo6HEzgz#qkdAIeLc|D zC^dxDlm9N}E5<1nq~(tyfOkdqx~Su7*={kCOJoi@huFMm&|4Ji8(sq{yA)5veE`&r zE3&ih15*Wx>;t53)y#}?9e0JL(`jIpa-F_daV3d5-?2v-+*AwvoT>~fI|ppLtc*>+ zMM^W6LvGMRc}$?Jg{#UNMJco$g&sjw34mGY5p1UU&K+TE@=$Jog-DSb6rOMHTLH$x zJ!?wn&XM7H*rlh(@rdVaQ(wMEI4@%% z59nSJG_fb>fmR>VBnCfCld9KPU;&~Y)^r%tfX$7X<4XXn8#QC5a3D5BGc$S~`2J1q++}MbWB^K_oFFg7IQ&)d4RcWdwFp|en3^R gJ-04dFDogq+dlJsoIA{%u5a0|gJJfQ!vj(O0mH&*(EtDd diff --git a/gui/gpsbabelfe_ru.ts b/gui/gpsbabelfe_ru.ts index fa8042215..76cc1ecda 100644 --- a/gui/gpsbabelfe_ru.ts +++ b/gui/gpsbabelfe_ru.ts @@ -106,7 +106,7 @@ p, li { white-space: pre-wrap; } Debugging diagnostics. -Higher number provides more deitaled diagnostics. +Higher number provides more detailed diagnostics. Отладочная диагностика. Чем выше номер, тем больше деталей. @@ -686,17 +686,17 @@ p, li { white-space: pre-wrap; } по умолчанию - + Select one or more input files Выберите один или несколько файлов - + Output File Name Имя выходного файла - + Error reading format configuration. Check that the backend program "gpsbabel" is properly installed and is in the current PATH This program cannot continue. @@ -705,7 +705,7 @@ This program cannot continue. Выполнение программы не может быть продолжено. - + Some file/device formats were not found during initialization. Check that the backend program "gpsbabel" is properly installed and is in the current PATH This program cannot continue. @@ -714,7 +714,7 @@ This program cannot continue. Выполнение программы не может быть продолжено. - + Input and output formats do not support %1 Входной и выходной форматы не поддерживают %1 @@ -727,109 +727,109 @@ This program cannot continue. Входной формат поддерживает %1; выходной формат не поддерживаетt %2 - + Input does not support %1; output format supports %1 Входной формат не поддерживает %1; выходной формат поддерживает %1 {1;?} - + Input format supports %1; output format does not support %1 Входной формат поддерживает %1; выходной формат не поддерживаетt %1 {1;?} - + Both input and output formats support %1 Входной и выходной формат поддерживают %1 - + waypoints маршрутные точки - + tracks треки - + routes маршруты - + There are no input options for format "%1" Нет входных параметров для формата "%1" - - + + Options for %1 Параметры %1 - + There are no output options for format "%1" Нет выходных параметров для формата "%1" - + No valid waypoints/routes/tracks translation specified Не выбрано преобразование маршрутных точек/маршрутов/треков - + No input file specified Не выбран входной файл - + No valid output specified Не выбран выходной файл - + No output file specified Не выбран выходной файл - + Process "%1" did not start Процесс "%1" не запустился - + Process exited unsuccessfully with code %1 Процесс завершился неудачей с кодом %1 - + Translation successful Конвертация выполнена - + Error running gpsbabel: %1 Ошибка запуска gpsbabel: %1 - + Are you sure you want to reset all format options to default values? Вы действительно желаете сбросить все параметры формата в значения по умолчанию? - + About %1 О %1 - + One or more data filters are active Один или более фильтров данных активны - + No data filters are active Фильтры данных не активны @@ -866,28 +866,28 @@ This program cannot continue. - - + + Routes Маршруты - - - - + + + + Tracks Треки - - + + Waypoints Маршрутные точки @@ -1093,13 +1093,13 @@ Some GPS data formats support only some subset of waypoints, tracks, and routes. Остановить процесс - + Process did not terminate successfully Процесс завершился неудачей - - Process crashed whle running + + Process crashed while running Неудача в процессе исполнения @@ -1192,7 +1192,7 @@ The quality of the results will vary depending on the density of points in the o - The reversal is performed in the laziest way possible. Timestamps are kept with the original waypoints so the resulting track or route will have the interesting characteristic that time runs backwards. This tends to make Magellan Mapsend, in particular, do a wierd thing and place each waypoint on a separate day. + The reversal is performed in the laziest way possible. Timestamps are kept with the original waypoints so the resulting track or route will have the interesting characteristic that time runs backwards. This tends to make Magellan Mapsend, in particular, do a weird thing and place each waypoint on a separate day. Additionally, if you're using this to reverse a route that navigates, say, an exit ramp or a one way street, you will be in for unpleasant ride. application cares about timestamps Разворот производится самым примитивным путем. Оригинальные точки сохраняют временные метки, так что результирующий трек или маршрут будет идти назад во времени. Это может заставить некоторые приборы, такие как в особенности Magellan Mapsend, вести себя странным образом и помещать каждую точку в отдельный день. Дополнительно, вы можете оказаться в неудобной ситуации, если используете такой маршрут для навигации по развязке или по улице с односторонним движением. Приложение следит за временными метками @@ -1262,35 +1262,40 @@ This option changes the time of all trackpoints. This might be useful if your tr Сдвинуть - - + + weeks + + + + + days дней - + hours ч - - + + mins мин - + secs с - - + + Use track pts. after this time. Использовать точки трека после этого времени. - + Use only track points after this timestamp. This option is used along with the stop to discard trackpoints that were recorded outside of a specific period of time. This option specifies the beginning of the time period. @@ -1299,33 +1304,33 @@ This option is used along with the stop to discard trackpoints that were recorde Этот параметр используется вместе со временем окончания, чтобы удалить точки трека, полученные вне заданного временного диапазона. Этот параметр задает начало диапазона. - + Start Начало - + If checked, time specified here is based on this computer's current time zone. Если включено, то время, указанное здесь, соответствует времени, указанному на компьютере. - + If checked, the times specified here are based on the local computer's time zone. Otherwise it is UTC. Если включено, то время, указанное здесь, соответствует времени, указанному на компьютере. Иначе - UTC. - + Local Time Местное время - - + + Use track pts before this time. Использовать точки трека до этого времени. - + Use only track points before this timestamp. This option is used in conjunction with the start option to discard all trackpoints outside of a given period of time. This option defines the end of the time period. @@ -1334,17 +1339,17 @@ This option is used in conjunction with the start option to discard all trackpoi Этот параметр используется вместе со временем начала, чтобы удалить точки трека полученные вне заданного временного диапазона. Этот параметр задает конец диапазона. - + Stop Конец - + Pack all tracks into one. Упаковать все треки в один. - + Pack all tracks into one. This option causes all tracks to be appended to one another to form a single track. This option does not work if any two tracks overlap in time; in that case, consider using the merge option. @@ -1357,17 +1362,17 @@ This option is most useful for rejoining tracks that might have been interrupted Полезен для объединения треков, которые могли быть разорваны из-за перебоев в работе прибора или остановки на ночь. - + Pack Упаковать - + Merge multiple tracks for the same way. Склеить несколько треков для того же пути. - + Merge multiple tracks for the same way. This option puts all track points from all tracks into a single track and sorts them by time stamp. Points with identical time stamps will be dropped. @@ -1376,116 +1381,116 @@ This option puts all track points from all tracks into a single track and sorts Этот параметр складывает все точки трека из всех треков в единый трек и сортирует их по временным меткам. Точки с одинаковыми метками - удаляются. - + Merge Склеить - + Split by Date Разбить по дате - + Split by Time Разбить по времени - + If nonzero, the track will be split if the time between two points is greater than this parameter. If zero, the track will be split by date. Если не 0, трек будет разбит если время между двумя точками больше, чем это значение. Если ноль, трек будет разбит по дате. - + hrs ч - + Split by Dist. Разбить по расстоянию - + If nonzero, the input track will be split into several tracks if the distance between successive track points is greater than the distance given as a parameter. Если не 0, исходный трек будет разбит на несколько треков если расстояние между последовательными точками больше, чем заданное. - + ft футов - + m м - + km км - + mi миль - + GPS Fixes GPS поправки - + none нет - + pps - + dgps - + 3d - + 2d - + Synthesize speed. Синтезировать скорость. - + Synthesize speed. -This option computes a value for the GPS speed at each trackpoint. This is most useful with trackpoints from formats that don't support speed information or for trackoints synthesized by the interpolate filter. The speed at each trackpoint is the average speed from the previous trackpoint (distance divided by time). The first trackpoint in each track is assigned a speed of "unknown." +This option computes a value for the GPS speed at each trackpoint. This is most useful with trackpoints from formats that don't support speed information or for trackpoints synthesized by the interpolate filter. The speed at each trackpoint is the average speed from the previous trackpoint (distance divided by time). The first trackpoint in each track is assigned a speed of "unknown." Синтезировать скорость. Эта опция позволяет вычислить значение скорости в каждой точке трека. Это может понадобится для форматов, не поддерживающих скорость, или для точек, синтезированных фильтром интерполяции. Скорость в каждой точке является средней скоростью от предыдущей точки трека (расстояние, деленное на время). Первая точка каждого трека получает значение "unknown." - + Speed Скорость - + Synthesize course. Синтезировать курс. - + Synthesize course. This option computes (or recomputes) a value for the GPS heading at each trackpoint. This is most useful with trackpoints from formats that don't support heading information or for trackpoints synthesized by the interpolate filter. The heading at each trackpoint is simply the course from the previous trackpoint in the track. The first trackpoint in each track is arbitrarily assigned a heading of 0 degrees. @@ -1494,7 +1499,7 @@ This option computes (or recomputes) a value for the GPS heading at each trackpo Эта опция позволяет вычислить (или пересчитать) значение для курса GPS в каждой точке трека. Это может понадобится для форматов, не поддерживающих азимут или для точек, синтезированных фильтром интерполяции. Азимут в каждой точке является простым углом от предыдущей точки трека. Первая точка каждого трека получает значение 0 градусов. - + Course Курс diff --git a/gui/latlng.cc b/gui/latlng.cc index 1cc2e0bb3..748366527 100644 --- a/gui/latlng.cc +++ b/gui/latlng.cc @@ -49,10 +49,10 @@ static double ArcInRadians(const LatLng& from, const LatLng& to) double longitudeArc = (from.lng() - to.lng()) * DEG_TO_RAD; double latitudeH = sin(latitudeArc * 0.5); latitudeH *= latitudeH; - double lontitudeH = sin(longitudeArc * 0.5); - lontitudeH *= lontitudeH; + double longitudeH = sin(longitudeArc * 0.5); + longitudeH *= longitudeH; double tmp = cos(from.lat()*DEG_TO_RAD) * cos(to.lat()*DEG_TO_RAD); - return 2.0 * asin(sqrt(latitudeH + tmp*lontitudeH)); + return 2.0 * asin(sqrt(latitudeH + tmp*longitudeH)); } /** @brief Computes the distance, in meters, between two WGS-84 positions. diff --git a/gui/map.cc b/gui/map.cc index 968d05a26..9efeb6e09 100644 --- a/gui/map.cc +++ b/gui/map.cc @@ -78,7 +78,7 @@ Map::Map(QWidget* parent, manager_ = new QNetworkAccessManager(this); connect(this,SIGNAL(loadFinished(bool)), this,SLOT(loadFinishedX(bool))); - this->logTime("Start map constuctor"); + this->logTime("Start map constructor"); #if HAVE_WEBENGINE MarkerClicker* mclicker = new MarkerClicker(this); diff --git a/gui/processwait.cc b/gui/processwait.cc index 8ae5806f4..93bb4d206 100644 --- a/gui/processwait.cc +++ b/gui/processwait.cc @@ -173,7 +173,7 @@ void ProcessWaitDialog::finishedX(int exitCode, QProcess::ExitStatus es) { ecode_ = exitCode; if (es == QProcess::CrashExit) { - errorString_ = QString(tr("Process crashed whle running")); + errorString_ = QString(tr("Process crashed while running")); } timer_->stop(); accept(); diff --git a/gui/rttrkui.ui b/gui/rttrkui.ui index 999c2c04e..7ccad8db5 100644 --- a/gui/rttrkui.ui +++ b/gui/rttrkui.ui @@ -118,7 +118,7 @@ The quality of the results will vary depending on the density of points in the o Reverse tracks and routes - The reversal is performed in the laziest way possible. Timestamps are kept with the original waypoints so the resulting track or route will have the interesting characteristic that time runs backwards. This tends to make Magellan Mapsend, in particular, do a wierd thing and place each waypoint on a separate day. + The reversal is performed in the laziest way possible. Timestamps are kept with the original waypoints so the resulting track or route will have the interesting characteristic that time runs backwards. This tends to make Magellan Mapsend, in particular, do a weird thing and place each waypoint on a separate day. Additionally, if you're using this to reverse a route that navigates, say, an exit ramp or a one way street, you will be in for unpleasant ride. application cares about timestamps diff --git a/gui/serial_mac.cc b/gui/serial_mac.cc index e5055ad7e..69fa90b3c 100644 --- a/gui/serial_mac.cc +++ b/gui/serial_mac.cc @@ -1,6 +1,6 @@ // Borrowed liberally (as allowed by license) from // http://developer.apple.com/samplecode/SerialPortSample/index.html -// This really is a slash-and-burn; no attempt was to make it very "C++-iike" +// This really is a slash-and-burn; no attempt was to make it very "C++-like" // Apple's copyright blob: /* diff --git a/gui/serial_win.cc b/gui/serial_win.cc index 1cf689b34..e4870775e 100644 --- a/gui/serial_win.cc +++ b/gui/serial_win.cc @@ -49,12 +49,12 @@ void MainWindow::osLoadDeviceNameCombos(QComboBox* box) char DevList[64*1024-1]; // a single byte more, and certain versions of windows // always return QueryDosDevice()==0 && GetLastError()==ERROR_MORE_DATA. // see http://support.microsoft.com/kb/931305 - // Get a list of all existing MS-DOS device names. Stores one or more asciiz strings followed by an extra null. + // Get a list of all existing MS-DOS device names. Stores one or more ASCII strings followed by an extra null. DWORD res = QueryDosDeviceA(NULL, DevList, sizeof(DevList)); if (res == 0) { DWORD err = GetLastError(); // could check for ERROR_INSUFFICIENT_BUFFER, and retry with a larger buffer. // but DevList is already at the maximum size it can be without running into kb 931305. - // FIXME: This shold be a QMessageBox::warning() - RJL + // FIXME: This should be a QMessageBox::warning() - RJL // fprintf(stderr,"QueryDosDevice() failed with %d. GetLastError()==%d.\n", res, err); (void) err; return; diff --git a/gui/trackui.ui b/gui/trackui.ui index 172b7b04d..2cbea7971 100644 --- a/gui/trackui.ui +++ b/gui/trackui.ui @@ -458,7 +458,7 @@ This option puts all track points from all tracks into a single track and sorts Synthesize speed. -This option computes a value for the GPS speed at each trackpoint. This is most useful with trackpoints from formats that don't support speed information or for trackoints synthesized by the interpolate filter. The speed at each trackpoint is the average speed from the previous trackpoint (distance divided by time). The first trackpoint in each track is assigned a speed of "unknown." +This option computes a value for the GPS speed at each trackpoint. This is most useful with trackpoints from formats that don't support speed information or for trackpoints synthesized by the interpolate filter. The speed at each trackpoint is the average speed from the previous trackpoint (distance divided by time). The first trackpoint in each track is assigned a speed of "unknown." Speed diff --git a/gui/upgrade.cc b/gui/upgrade.cc index 0ba4da106..581228213 100644 --- a/gui/upgrade.cc +++ b/gui/upgrade.cc @@ -174,7 +174,7 @@ UpgradeCheck::updateStatus UpgradeCheck::getStatus() // and are stored as strings. They may be of the form "1.6.0-beta20200413" // which, if sorted as a string, will be after "1.6.0" which is bad. Use // this function to sort that out. (See what I did there? Bwaaaahah!) -bool UpgradeCheck::suggestUpgrade(QString from, QString to) +bool UpgradeCheck::suggestUpgrade(const QString& from, const QString& to) { int fromIndex = 0; int toIndex = 0; @@ -234,7 +234,7 @@ void UpgradeCheck::httpRequestFinished(QNetworkReply* reply) qDebug() << "redirect to " << redirectUrl.toString(); } // Change the url for the next update check. - // TOODO: kick off another update check. + // TODO: kick off another update check. upgradeUrl_ = redirectUrl; replyId_ = nullptr; reply->deleteLater(); diff --git a/gui/upgrade.h b/gui/upgrade.h index 7ca4c12f6..f39993808 100644 --- a/gui/upgrade.h +++ b/gui/upgrade.h @@ -63,7 +63,7 @@ private: QString getOsName(); QString getOsVersion(); QString getCpuArchitecture(); - bool suggestUpgrade(QString from, QString to); + bool suggestUpgrade(const QString& from, const QString& to); private slots: void httpRequestFinished(QNetworkReply* reply); -- 2.30.2